From: Ian Jackson <iwj@xenproject.org>
Date: Tue, 28 Sep 2021 11:51:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/staging' into staging
X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~156
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=890ceb9453171c85e881103e65dbb5cdcf81659e;p=xen.git

Merge remote-tracking branch 'origin/staging' into staging
---

890ceb9453171c85e881103e65dbb5cdcf81659e
diff --cc Config.mk
index 82b0c7c227,e85bf18654..e7af4a402d
--- a/Config.mk
+++ b/Config.mk
@@@ -244,9 -244,9 +244,9 @@@ QEMU_TRADITIONAL_URL ?= git://xenbits.x
  SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
  MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
  endif
 -OVMF_UPSTREAM_REVISION ?= b37cfdd2807181aed2fee1e17bd7ec1190db266a
 +OVMF_UPSTREAM_REVISION ?= 7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5
  QEMU_UPSTREAM_REVISION ?= master
- MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5
+ MINIOS_UPSTREAM_REVISION ?= 9f09744aa3e5982a083ecf8e9cd2123f477081f9
  
  SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0